Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #120807

Merged
merged 20 commits into from
Feb 8, 2024
Merged

Rollup of 9 pull requests #120807

merged 20 commits into from
Feb 8, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 20 commits February 2, 2024 22:47
Remove unused args from functions

`#[instrument]` suppresses the unused arguments from a function, *and* suppresses unused methods too! This PR removes things which are only used via `#[instrument]` calls, and fixes some other errors (privacy?) that I will comment inline.

It's possible that some of these arguments were being passed in for the purposes of being instrumented, but I am unconvinced by most of them.
…gillot

No need to take `ImplTraitContext` by ref

We used to mutate `ImplTraitContext`, so it used to be `&mut` mutable ref. Then I think it used to have non-`Copy` data in it, so we took it by `&` ref. Now, none of that remains, so just copy it around.
Remove myself from review rotation.

I've been unable to keep up with reviews. :(

Not sure if this helps much, considering there aren't many other libs reviewers on the rotation at the moment.

Hopefully I can add myself back again Soon™ when I can commit more time to reviewing.
…piler-errors

Make `min_exhaustive_patterns` match `exhaustive_patterns` better

Split off from rust-lang#120742.

There remained two edge cases where `min_exhaustive_patterns` wasn't behaving like `exhaustive_patterns`. This fixes them, and tests the feature in a bunch more cases. I essentially went through all uses of `exhaustive_patterns` to see which ones would be interesting to compare between the two features.

r? `@compiler-errors`
…mir, r=compiler-errors

Deduplicate `tcx.instance_mir(instance)` calls in `try_instance_mir`
Fix mir pass ICE in the presence of other errors

fixes rust-lang#120779

it is impossible to add a ui test for this, because it only reproduces in build-fail, but a test that also has errors in check-fail mode can't be made build-fail 🙃

I would have to add a run-make test or sth, which is overkill for such a tiny thing imo.
…, r=Mark-Simulacrum

Add release note for new ambiguous_wide_pointer_comparisons lint

I found out about this new lint in Rust because I had code allowing the Clippy lint. Clippy alerted me to the lint name change, and I went searching for the new lint's name in the release notes and was surprised there wasn't an item for it.
…trieb

Avoid ICE in drop recursion check in case of invalid drop impls

fixes rust-lang#120787
@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Feb 8, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Feb 8, 2024

📌 Commit ed52851 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 8, 2024
@bors
Copy link
Contributor

bors commented Feb 8, 2024

⌛ Testing commit ed52851 with merge 98aa362...

@bors
Copy link
Contributor

bors commented Feb 8, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 98aa362 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 8, 2024
@bors bors merged commit 98aa362 into rust-lang:master Feb 8, 2024
12 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 8, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#120590 Remove unused args from functions 6dcbfb9c5e5bd0cdc9f82eab8d1596d7e9bf974d (link)
#120750 No need to take ImplTraitContext by ref 637181ae09ab141fd513f14a1c4d20d6f156240c (link)
#120769 make future diffs minimal edc9b8a422a2ad01f5f042265c38c1006fae2f88 (link)
#120772 Remove myself from review rotation. 468aee7099bc57e3e3e6244d851a0d76f1424dce (link)
#120775 Make min_exhaustive_patterns match exhaustive_patterns 9fc7e5fc1e360414a6a92327f89da2bd8b7e8252 (link)
#120778 Deduplicate tcx.instance_mir(instance) calls in `try_inst… 248fa9994a07dc88692f1765ca3b952354fe9dc5 (link)
#120782 Fix mir pass ICE in the presence of other errors a171ec0010b09e1a075a1789de1634fddc62e11f (link)
#120783 Add release note for new ambiguous_wide_pointer_comparisons… 2ad23cee8f5d9699ee267b7df7ee3449612766c3 (link)
#120801 Avoid ICE in drop recursion check in case of invalid drop i… 8863327c884693b51a434c878f8cc9b3f3df2360 (link)

previous master: c29082fe7d

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (98aa362): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
1.5% [0.9%, 2.2%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 1.5% [0.9%, 2.2%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 662.416s -> 661.327s (-0.16%)
Artifact size: 308.28 MiB -> 308.28 MiB (0.00%)

@matthiaskrgr matthiaskrgr deleted the rollup-1pf3glu branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.